More work on extension.