Added analytics (for real this time)