change out form and add all
fix bug