added support for -j and -m