Revert "added new forms"

This reverts commit aead7f7727815462e606aa3dbcab2192a815ac38.
Revert "Revert "added new forms""

This reverts commit 4eeea64647eb3c4201e1168fdb84be08c2bdda3c.