Update to beta 6