Performance tuning (47/48)

Performance tuning