switching to stl map class