better support for options going forward