Updated has substr