Updated Passive logic