Add more state juggling