added in Chas' changes to map