Performance improvement (47/48)

Performance improvement