Better animation handling