Final changes and commits