multiple changes to rework setup