More work on new design