Some changes to toggle when clipper is used