Updated CreateReport and Main