Better option habdling.
Better option handling.