modified options handling