updated reg expressions