Updated for patch 6.0.2