Some internal rework