fixed a merge fail, introduced animations (still buggy)