Updated to beta 1-2