Improve Design (2)