refactored app
merge conflict solved