now handling gen targets properly