Changes from comments set#1