Updated Form Tools