added regexpes, change output