Updates in mech.py