Added change based on feedback