Few changes - master broken, refactoring.