changed logging structure