added hash map, need to implement