Updated to beta 6