convert majority of sites to command api