removed unnecessary generators (got a better one now)