some generators added