edited master1