updated convert w/ json