Updated forms behiavior