diff --git a/app/page.tsx b/app/page.tsx
index e3b71e6..3dbf499 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -15,19 +15,23 @@ export default function Home() {
 
   const projects = t.projects.items.map((item, index) => ({
     ...item,
-    id: index === 1 ? 'project-rbc' : undefined,
-    status: index === 1 
+    id: index === 3 
+      ? 'project-rbc' 
+      : index === 4 
+        ? 'project-aws' 
+        : undefined,
+    status: index === 3 
       ? 'completed' as const 
       : index === 5 
         ? 'building' as const 
         : 'live' as const,
-    media: index === 0 
-      ? { type: 'video' as const, url: 'https://www.youtube.com/watch?v=wdJ5DN15jus' }
-      : index === 1
-        ? { type: 'image' as const, url: '/rbc-images.jpeg' }
+    media: index === 3 
+      ? { type: 'image' as const, url: '/rbc-images.jpeg' }
+      : index === 4
+        ? { type: 'video' as const, url: 'https://www.youtube.com/watch?v=wdJ5DN15jus' }
         : undefined,
     videoUrl: index === 5 ? 'https://github.com/rockliang/go-flink' : '#',
-    articleUrl: index === 0 ? 'https://lnkd.in/p/gm2PZkWw' : '#',
+    articleUrl: index === 4 ? 'https://lnkd.in/p/gm2PZkWw' : '#',
   }))
 
   return (
diff --git a/components/ExperienceTimeline.tsx b/components/ExperienceTimeline.tsx
index cf29081..e28a24b 100644
--- a/components/ExperienceTimeline.tsx
+++ b/components/ExperienceTimeline.tsx
@@ -14,15 +14,15 @@ const colors = [
 const skills = [
   ['LangGraph', 'Temporal', 'LLM Ops', 'PyTorch', 'Kafka', 'Observability', 'Go-Flink'],
   ['Golang', 'Terraform', 'IaC', 'OpenShift', 'Docker', 'Distributed Systems', 'Grafana'],
-  ['AWS', 'Java', 'gRPC', 'Distributed Systems', 'DynamoDB', 'CloudWatch'],
-  ['Machine Learning', 'Golang', 'Anomaly Detection', 'C++', 'CMake', 'Data Security'],
-  ['Django', 'React', 'Agile', 'Web Development', 'Sonar', 'ATC Systems'],
+  ['Java', 'AWS', 'DynamoDB', 'CloudWatch', 'gRPC', 'Distributed Systems', 'Ownership', 'Disaster Recovery', 'Observability'],
+  ['C++', 'CMake', 'Golang', 'Docker'],
+  ['ReactJS', 'Django', 'Agile', 'Sonar'],
 ]
 
 const links = [
   null,
   '#project-rbc', // RBC - link to RBC project showcase
-  null,
+  '#project-aws', // AWS - link to AWS project showcase
   null,
   'https://plan.navcanada.ca/account/login/?next=/',
 ]
@@ -30,7 +30,7 @@ const links = [
 const linkTexts = [
   '',
   'Learn more →',
-  '',
+  'Learn more →',
   '',
   'View Product →',
 ]
diff --git a/components/ProjectShowcase.tsx b/components/ProjectShowcase.tsx
index 4d55321..fbb2663 100644
--- a/components/ProjectShowcase.tsx
+++ b/components/ProjectShowcase.tsx
@@ -107,7 +107,7 @@ export function ProjectShowcase({
               <ul className="mt-3 space-y-1">
                 {bullets.map((bullet, i) => {
                   // Highlight skills: parentheses + keywords
-                  const skillKeywords = ['Terraform', 'Golang', 'K8s', 'Slack', 'Grafana', 'IaC', 'Docker', 'OpenShift', 'Temporal', 'Kafka', 'gRPC', 'AWS', 'Java', 'Python', 'Go', 'C++']
+                  const skillKeywords = ['Terraform', 'Golang', 'K8s', 'Slack', 'Grafana', 'IaC', 'Docker', 'OpenShift', 'Temporal', 'Kafka', 'gRPC', 'AWS', 'Java', 'Python', 'Go', 'C++', 'CloudWatch', 'DynamoDB']
                   const escapeRegex = (s: string) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
                   const pattern = new RegExp(`(\\([^)]+\\)|${skillKeywords.map(escapeRegex).join('|')})`, 'g')
                   const parts = bullet.split(pattern).filter(Boolean)
diff --git a/lib/translations.json b/lib/translations.json
index bc19a09..258874d 100644
--- a/lib/translations.json
+++ b/lib/translations.json
@@ -79,10 +79,22 @@
       "askPoimen": "Ask Poimen for technical details",
       "items": [
         {
-          "title": "AWS Distributed-Map",
-          "description": "Launched distributed task orchestration service for mission-critical workloads.",
-          "longDescription": "Optimized execution across 57+ regions with fault-tolerant scheduling and auto-scaling.",
-          "stat": "Production launch, 57+ regions"
+          "title": "Homelab: Kubernetes Cluster",
+          "description": "Bare-metal Kubernetes cluster running production workloads.",
+          "longDescription": "Talos OS with 3-node control plane. Cilium eBPF CNI, Longhorn storage, ArgoCD GitOps.",
+          "stat": "3-node cluster, 99.2% uptime"
+        },
+        {
+          "title": "Homelab: LLM Inference",
+          "description": "Production LLM inference pipeline with CPU optimization.",
+          "longDescription": "Temporal-based orchestration with INT4/INT8 quantization. Achieved 60% latency reduction.",
+          "stat": "60% latency cut, real-time inference"
+        },
+        {
+          "title": "Homelab: Kafka Cluster",
+          "description": "High-throughput event streaming with Strimzi KRaft.",
+          "longDescription": "3-broker KRaft cluster with auto-scaling, persistent storage, and monitoring.",
+          "stat": "3 brokers, 1K+ msgs/sec"
         },
         {
           "title": "RBC: Multi-Cloud Platform",
@@ -103,22 +115,17 @@
           }
         },
         {
-          "title": "Homelab: Kubernetes Cluster",
-          "description": "Bare-metal Kubernetes cluster running production workloads.",
-          "longDescription": "Talos OS with 3-node control plane. Cilium eBPF CNI, Longhorn storage, ArgoCD GitOps.",
-          "stat": "3-node cluster, 99.2% uptime"
-        },
-        {
-          "title": "Homelab: LLM Inference",
-          "description": "Production LLM inference pipeline with CPU optimization.",
-          "longDescription": "Temporal-based orchestration with INT4/INT8 quantization. Achieved 60% latency reduction.",
-          "stat": "60% latency cut, real-time inference"
-        },
-        {
-          "title": "Homelab: Kafka Cluster",
-          "description": "High-throughput event streaming with Strimzi KRaft.",
-          "longDescription": "3-broker KRaft cluster with auto-scaling, persistent storage, and monitoring.",
-          "stat": "3 brokers, 1K+ msgs/sec"
+          "title": "AWS Distributed-Map",
+          "description": "Launched distributed task orchestration service for mission-critical workloads.",
+          "longDescription": "Optimized execution across 57+ regions with fault-tolerant scheduling and auto-scaling.",
+          "stat": "57+ regions, sub-100ms P99, 20x burst traffic",
+          "highlight": "Introduced JSON state input for larger payloads—unlocked new customer use cases.",
+          "bullets": [
+            "Under tight deadline, introduced separate state in Map vs new functions—simplified customer adoption (Java)",
+            "Built checkpoint recovery for mid-workflow failures—customers resume without full re-run",
+            "Solved distributed edge cases: race conditions, concurrent updates, dependent service failures, message deduplication",
+            "Owned oncall for the service—built CloudWatch dashboards, wrote runbooks, debugged production live"
+          ]
         },
         {
           "title": "Open Source: go-flink",
@@ -135,8 +142,8 @@
         {
           "company": "riotpiao.com",
           "role": "DevOps / SRE / SDE",
-          "period": "May 2026 — Present",
-          "description": "Built and maintain production-grade homelab on bare-metal Kubernetes (3-node Talos cluster). Architected Temporal-based LLM inference pipelines with 60% latency reduction. Full GitOps automation with ArgoCD, Terraform, and custom operators."
+          "period": "May 2025 — Present",
+          "description": "Architected and operates a production-grade, self-hosted cloud platform on bare-metal Kubernetes—featuring OIDC SSO with RBAC, GitOps-driven infrastructure, CI/CD with container registry, Kafka message queuing, managed PostgreSQL, S3-compatible object storage, GPU-accelerated LLM inference, and workflow orchestration. Essentially AWS rebuilt from scratch at home."
         },
         {
           "company": "RBC",
@@ -148,19 +155,19 @@
           "company": "AWS",
           "role": "Senior Software Engineer (Step Functions)",
           "period": "2022 — 2024",
-          "description": "Core contributor to AWS Step Functions, scaling to 57+ regions. Designed and implemented 8 critical components for distributed state machine execution. Achieved sub-100ms P99 latency for high-throughput workflow orchestration."
+          "description": "Owned Distributed-Map from design doc to production launch across 57+ regions. Full lifecycle: planning, implementation, oncall, status reporting—we built it, we fixed what we broke."
         },
         {
           "company": "Titus",
-          "role": "ML Software Engineer Intern",
+          "role": "Software Engineer Intern",
           "period": "May — Aug 2019",
-          "description": "Built Personal Data Detection pipeline with 97.8% accuracy using transformer models. Developed Golang connector reducing p99 latency by 28%. Created SmartRegex system accelerating model deployment by 5x."
+          "description": "Streamlined Personal Data Detection to detect anomaly exit of classified data—achieved 97.8% accuracy. Built fault-tolerant Golang connector—28% p99 improvement over legacy. Re-integrated SmartRegex with CMake & C++ on Linux/Unix—5x faster deployment."
         },
         {
           "company": "NAV Canada",
           "role": "Summer Student",
           "period": "May — Aug 2018",
-          "description": "Developed CFPS Flight Planning application using Django and React. Implemented NOTAMJ polling system and integrated Sonar code coverage. Built FWGS weather briefing interface for pilots."
+          "description": "Maintained enterprise web app CFPS in Agile development process. Built Django NOTAMJ polls app to meet iteration goals. Improved deploy stability with Sonar code coverage. Created FWGS weather briefing interface with ReactJS for ATC."
         }
       ]
     },
@@ -255,10 +262,22 @@
       "askPoimen": "问Poimen了解技术细节",
       "items": [
         {
-          "title": "AWS Distributed-Map",
-          "description": "发布面向关键任务的分布式任务编排服务。",
-          "longDescription": "在57+区域优化执行，具有容错调度和自动扩展功能。",
-          "stat": "生产发布，57+区域"
+          "title": "家庭实验室：Kubernetes集群",
+          "description": "运行生产工作负载的裸机Kubernetes集群。",
+          "longDescription": "Talos OS 3节点控制平面，Cilium eBPF CNI，Longhorn存储，ArgoCD GitOps。",
+          "stat": "3节点集群，99.2%可用性"
+        },
+        {
+          "title": "家庭实验室：LLM推理",
+          "description": "具有CPU优化的生产LLM推理管道。",
+          "longDescription": "基于Temporal的编排，INT4/INT8量化，延迟降低60%。",
+          "stat": "延迟降低60%，实时推理"
+        },
+        {
+          "title": "家庭实验室：Kafka集群",
+          "description": "使用Strimzi KRaft的高吞吐量事件流。",
+          "longDescription": "3代理KRaft集群，具有自动扩展、持久存储和监控。",
+          "stat": "3代理，1K+消息/秒"
         },
         {
           "title": "RBC: 多云平台",
@@ -279,22 +298,17 @@
           }
         },
         {
-          "title": "家庭实验室：Kubernetes集群",
-          "description": "运行生产工作负载的裸机Kubernetes集群。",
-          "longDescription": "Talos OS 3节点控制平面，Cilium eBPF CNI，Longhorn存储，ArgoCD GitOps。",
-          "stat": "3节点集群，99.2%可用性"
-        },
-        {
-          "title": "家庭实验室：LLM推理",
-          "description": "具有CPU优化的生产LLM推理管道。",
-          "longDescription": "基于Temporal的编排，INT4/INT8量化，延迟降低60%。",
-          "stat": "延迟降低60%，实时推理"
-        },
-        {
-          "title": "家庭实验室：Kafka集群",
-          "description": "使用Strimzi KRaft的高吞吐量事件流。",
-          "longDescription": "3代理KRaft集群，具有自动扩展、持久存储和监控。",
-          "stat": "3代理，1K+消息/秒"
+          "title": "AWS Distributed-Map",
+          "description": "发布面向关键任务的分布式任务编排服务。",
+          "longDescription": "在57+区域优化执行，具有容错调度和自动扩展功能。",
+          "stat": "57+区域，P99延迟<100ms，20x流量突发",
+          "highlight": "引入JSON状态输入支持更大负载——解锁新客户场景。",
+          "bullets": [
+            "紧迫deadline下，在Map中引入独立状态而非新函数——简化客户接入（Java）",
+            "构建checkpoint恢复机制——客户可从失败点恢复，无需重跑",
+            "解决分布式边缘场景：竞态条件、并发更新、依赖服务故障、消息去重",
+            "负责服务oncall——构建CloudWatch仪表盘，编写runbook，实时调试生产问题"
+          ]
         },
         {
           "title": "开源：go-flink",
@@ -311,8 +325,8 @@
         {
           "company": "riotpiao.com",
           "role": "DevOps / SRE / 软件开发",
-          "period": "2026年5月 — 至今",
-          "description": "在裸机Kubernetes（3节点Talos集群）上构建和维护生产级家庭实验室。架构基于Temporal的LLM推理管道，延迟降低60%。使用ArgoCD、Terraform和自定义操作器实现完整GitOps自动化。"
+          "period": "2025年5月 — 至今",
+          "description": "在裸机Kubernetes上架构并运维生产级自托管云平台——具备OIDC SSO + RBAC、GitOps驱动的基础设施、CI/CD容器仓库、Kafka消息队列、托管PostgreSQL、S3兼容对象存储、GPU加速LLM推理、工作流编排。相当于在家从零重建AWS。"
         },
         {
           "company": "RBC",
@@ -324,19 +338,19 @@
           "company": "AWS",
           "role": "高级软件工程师 (Step Functions)",
           "period": "2022 — 2024",
-          "description": "AWS Step Functions核心贡献者，扩展至57+区域。设计实现8个关键组件用于分布式状态机执行。高吞吐量工作流编排实现P99延迟低于100ms。"
+          "description": "负责Distributed-Map从设计文档到57+区域生产发布的全生命周期。完整流程：规划、实现、oncall、状态汇报——我们构建，我们修复。"
         },
         {
           "company": "Titus",
-          "role": "机器学习软件工程师实习",
+          "role": "软件工程师实习",
           "period": "2019年5月 — 8月",
-          "description": "使用transformer模型构建准确率97.8%的个人数据检测管道。开发Golang连接器，p99延迟降低28%。创建SmartRegex系统，模型部署速度提升5倍。"
+          "description": "优化个人数据检测系统，识别机密数据异常流出——准确率97.8%。构建容错Golang连接器——p99延迟比旧版提升28%。用CMake & C++在Linux/Unix上重新集成SmartRegex——部署速度提升5倍。"
         },
         {
           "company": "NAV Canada",
           "role": "暑期实习生",
           "period": "2018年5月 — 8月",
-          "description": "使用Django和React开发CFPS航班计划应用。实现NOTAMJ轮询系统并集成Sonar代码覆盖。为飞行员构建FWGS天气简报界面。"
+          "description": "在敏捷开发流程中维护企业级Web应用CFPS。构建Django NOTAMJ轮询应用达成迭代目标。通过Sonar代码覆盖率检查提升部署稳定性。用ReactJS为ATC创建FWGS天气简报界面。"
         }
       ]
     },