number version updated and safe wrappers with logger
refactoring and dublication removed