Update to a better, more gitty way