Updates to base.py