Changed configure so you can partially update options