more old code updates