Can you revert this to pass the options in as an argument rather than grabbing them from the global namespace?