Performance tuning

shape