Better disabler
Better disabler
Better disabler
Merge branch 'fixes'