Design improvement 2