Heavy work on registration