more flexibility changes, needs to be tested on diff physical machines