added isActive flag