add check for -s and -m