clarified regexp... still more room