updated options framework