Performance optimization

shape