corrected hashmap