A lot of logging is added
fixed