Started to adapt the design