GON - Updated directive improved