More reworking