Implemented changes based on feedback