minor change
minor change
minor change
deferred calculation of state tree