additional loggin
refactor