Added prediction to OnDraw and fixed ultimate prediction