small modifications
add who