initial reworking