Yesterday work - Improving the design