Updated to match the new urls