Issue #4 - Differentiate between active/unactive