Refactor for true state