diamond bug fix
final demo