modify design 2

pullreq 5