update form helpers for Jeff review