[ORB-25] changes requested by Sarah