modif for master #1