Removed the bit about getting the cwd, not needed anymore