Please improve the design!