preliminary movement highlight demo
fix merge conflict