changed the way options are defined