Validation code fixed and ready to go