Contiued work on registration