reworking to meet new design