Improve FormForForm