added user whoami to make it more general