upgrade to Options changes