added some logic for moving back to storage