updated form functionality for wave 10