Some changes based on feedback