Note to self, need to merge this update forward manually since in otherwise won't be in json_xml and after.