0.41  refactoring