Major updates on the forms