removed conditional loggin