Start to implement the new design