fixed generators and requirements