Efficiency improvement

shape