merging
merging 2
Merging and refactoring