Gen2 upgrade to Fibonacci generator + main upgrade