Updated for full intro features.