Updated to new Analytics