surprise, surprise, more structure changes.  Should be better now