changes to form handler