Got rid of the annoying dictionary