more work on analytics