fix
fix the wagging
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
draw diff color depending on state