companion rework