Klavan's One State Solution