More changes to test the options (not working yet)