Match the design more closely