some more in-progress changes