Added report and some changes