added activeOnly param