works in one shot
works in one shot
removed logging