major rework everywhere