Updated for latest nighly