updated (mostly again) for 2.35