CPS rebuild?