Added better pattern, improved results display