added forms
fixed merge conflics