changes needed to run on distributed way properly