Generation logic modified