Adding -r flag to enable rigorous checking