Changed the mapping and plotting scripts