Added some stuff for log