refactoring merged back