added option matching