More work on the basic design