minor regex modification to make things more dynamic