updated generic form
fixed bug