added basic criteria
added basic generate report table