Changed location of comments