change whoami to expandable