last commit

last nightly commit for 3-12 fully functioning