Added 8.2.0.0 stuff