Comments update 1.1