Core/ wintergrasp update