Updated to beta 25