updated basic generators