First commit new design