updated to use new way of fetching options