Rev'd to V1 added injectable Generators