lots of updates after KMPS review- work in progress