Rewrote after git fail