Optimizations but animation bug