An updated spinny map to work with the new api's