Updated to beta 7