mod Design

This rolls back to commit 06d46c1054f11f9c4070e97323d74657d0406356.