Reorganized and changed update procedure