Added Active/Not Active functionality.