Small changes to OPs