setupdata fixed - and report added