More work on the design