merged gregors changes