updated mapping scripts