Update to latest design