Better animation now - still buggy