fixed all the outdated apis