Generation 6 Improvements