Updated to Design V2