better state + presidential logic