redoing this work because git is an asshole