Switched to rerun instead of shotgun (and upgraded all deps with it)