Final changes with more comments