Modified to allowed merging of suggestions
Refactoring