added more form processing