inital rework commit