adding a change from the cdm_endgame branch