design change
Merge pull request #37 from Velaport/let-1344

design change