Add prediction, but still need to fix glitches