Started implementing the new version of design