Need to update more frequently and check the language