added more regex