John's Commit: Changes are done