changes for variants
use my branch of nstools