Performance improvement (44/48)

Performance improvement