Design improvement2