update options for a more modular approach