better logic for pulling opts