More thourough logging