Staying true to 'two-state'