added -o switch