Redoing reports
Add more picard metrics