renamed -M option to --from