change to use the opts