stuff
Added logging