a couple changes but functionality same as last commit (tried unsuccesfully to fix subshell, sort of gave up at this point)