Updated patt names and debuging