Updated to beta 39