missed changes from merge