More activate/deactive logic