Rework for git