Updated to use universal analytics