Updated to coincide with changed in API