property ordering needs a bit of cleanup here.