Changed variable assignment, now hashmap