added some hashmap stuff