Revert "rollback"

This reverts commit 24f324c3bf0660646708a27c21ff9590eb9f5727.
remove last commit
re-added Form2