removed -s option