changed way the options are built for some