changed to hashmaps