Updated to use global OPTIONS variable