Update design

Resolves #138