added more regex and fixed the icpu limmitation