Some reworking of registers