Improved design and code.