replaced -o- occurences with -s-