Options revamp