cleaner design
Merge branch 'refs/heads/design'