bugfixxing, speedup animation