Changed to support beta5