[Improved] User optimization