Changes related to comments