Performance improvement (46/48)

Performance improvement