Update with current design idea