rework since missing git