updated to work with beta 12.