changes from beta3 branch