added fields
fixed form