Some changes in forms (not finished)