Reimplement animation improvements.