updated for beta6