* Significant NaBL improvements for function
* Reenable NaBL