Performance improvement (45/48)

Performance improvement