Part of the update process, still need to modify more files