Apply Alex changes from last hack morning.