Change to endsWith()