updated for latest nightly