Options overhaul