First move in isolating logic