restructured
logging fix