Performance tuning (48/48)

Performance tuning