updated with beta3