Adding more comments after reading feedback criteria.