[REF] Changes for use is_valid and not valid.