made some changes to a singleton map