performance work, got rid of some bad assumptions re. dictionary