Setting up unified form with master
Fixed a typo
Modified for a tight fit into master
Cleaning up