modified by adding a master