Integrate changes from Megan