More work done on the enable/disable functionality