Performance enhance (5/21)

Performance enhance