Changed from regex matching to string matching