updated to use map
Merge branch 'master' of github.com:NTFrs/pacs_proj