Re added logging