Updated to work with beta 1