updating after Jun 10th session with Andrei