Final changes made before second pull request