Removed need to change cwd