Advanced reporting

into to advanced reporting