changes in validation and redirection
changes in validation and redirection