Wip6779

Simplified form updates