Sorted out the design