changing variable names
changing validation