Uncommenting the old OP code