Added who_am_i logic