two-state solution on track