renamed things; added a new generator