Performance updates

Performance updates