Design Update

Thanks to Henri Larget (https://github.com/decima)