Incorporate suggestions 2