Incorporate comments