Add logging to all the other places