refactoring succesful
refactoring succesful + merge