Updated with the newest version of analytics