added hashmap, that works