Better report and marking mechanism