* Missed a couple data.from replacements