update based on feedback 2