Design update
Merge branch 'test' of https://github.com/nromanen/Ch-024 into test