updating for situation 7