Add changes from Andrei and Shelly