Added decoupling, corrected saha.py