added forms and fixed process