Added -o and -i options