[Suggestion] Another improvement.