big upgrade, will crash github but not local