Major rework and new design