Performance tuning (8/48)

Performance tuning