Not sure how to combine these two regex...