fix based on feedback