Upgrading to beta3 part1