Added front end validation