updated for beta 6