Forms updated to facilitate later analysis