Adding flo's new validations