Updated code base after meeting with Al & John