form updated (not finished)