Updated mapping.py