edited return for create and store