Changes to add finalized registration code