Code revisions from Aug & Jan
Code revisions