Last Commit. Final changes