Productivity improvement

shape