Upgraded to latest nightly