Performance improvement (10/48)

Performance improvement