Implemented suggestions.