Updating to possibly broken code