Some more work on the new design