Design update

12.6 update