Reworked registration