Added WAY/GENERATORS