Productivity improvements

shape