startsWith/endsWith updated