updating regex for final analysis