changed to hashmap
doing time issue