Remove this and use the code that's in the `Base.py` method