Major conversion changes for update