Final Commit, finished all comments