updates to replacement structure for options