More work on registration