TODO change key for the hashmap