updated for beta 7