Add in more checks for final frame animation