[Phase 2] Uplift [Abelar]