Newer version where git hopefully doesn't fuck up