Added -e option