existence check via lookup table might also be a useful change.