Performance improvement (39/48)

Performance improvement