Performance improvement (40/48)

Performance improvement