Added -s and -m