Fixed: no longer using a dict.