Remade again stuff because of github corrupting files