some more changes, still working on MI