Small changes in whoAmI