IMF and Wd1 changes on laptop.
Merged imf.py changes