updated with latest version of options framework