major rework fro new design