Committing changes I made last friday on the max