updated regex expression (more accurate now)