Update with better options