Integrated Laura's latest changes