Added name calc and submit/reset exclusion