-- replaced whoami call with call to id