Updated disable/enable functionality