Updated after beta10 release