incorporated comment changes in sprint#6