Performance improvement

shape