bob: added a line
bob: merged alice's changes