added feature gen
merged code