code clean up, added prediction wait animation