changes to deal with comments