Incorporate changes and suggestions