Adding first implementation of [enable / disable]