Latest code and right now working on the report