Improvements to design and code