added analytics and updated classes