after merge fix and little code refactoring