Should have greatly improved animation performance