Implemented the lastest design