Made the extra options conform to how it is going to work