let-630: design change
Merge pull request #16 from Velaport/let-620

let-630: design change