[ST] Performance verbessert