animations improved a bit, but still xyz issue