Final changes with comments