Tech debt and improvements based on Shanjian's feedback