Re-design for Upaji