Edison.py up to date