Lets update these ancient parts