Commiting Core and Max changes