upgrade to support spinoff