Updated to beta 2