updated based on feedback on ticket