Changed to check for tmp folder
Removed restarting for now