Animation triggering improvements