merged in forms update