update according to the master code