Changed to report structure