merging Wes and John's stuff for map