More work on version 2.