Nightwolf update from Boon

Nightwolf update from Boon