Pushing to latest commit. See comments for changes.