fixed all CR