Backed out Harry's changes, added Zacs
Merged Zacs changes