Performance improvement (34/48)

Performance improvement