Performance tuning (45/48)

Performance tuning