[Suggestion] Efficienty upgrade