Incorporate suggestions