Restored old generators
Made it compilling