Updating options
More changes