Changing the logic for handling options