Amended logic to include self as factor