Added custom form functions