Added lenient flag