added analytics and everything