Updated  whoami