Reimplemented animation

It don't crash no more