Added -S option