Updates to implement the design