Adding in 2.0beta4