Update to current design