some minor changes in order to complete the storing process