Performance improvement (41/48)

Performance improvement