Changed more regex