Added analytics and stuff