compiled changes from previous merge