Changes to the try and get the analytics working