try to simplify state management