Update challenge4 to have all the validation