Made some small changes for FROM/TO