A bit of reworking