Suggestions addressed