Changed to 2-step instead of 3-step targeting