rework for docker, phase 2