completion normal storage with state management