Design minor improvement