updated options handling