[ Second generation upgrade ]