Performance boost

Performance boost