Updated encounters. Should be ready for M7.