More work on register