Improved disabling functionality