Performance improvement (8/48)

Performance improvement