Changes addressing issue #5 - pay attention to 'enabled' attributes