Improved design.