Make the to/from more clear