Fix effort... and reporting part is DONE!