Changes with comments in various files !!!