added/modified regex