Updated for Gen 6