Latest round of changes based on feedback