reorganization
fancier regex specifications