Updated to beta 3.0