Updated to latest Nvelope