changes to option behavior