Changed -e to -s per new CLI