Made to work with logger
Fixing merge prblm