added debug, removed regex