Comment related changes