convert to the new stuff