simplified regex
repacked workflow