new design for optional and variant