diamond bug fix
diamond bug fix
final demo