Options redesigned