More reworking based on feedback