Improved Performance

shape
shape
shape
shape
shape
shape
shape
shape