revert back to using then() cause back() doesnt always work