improving CurrentState.load()...