Improved when to enable commands