add convert and expand