Fix the criteria bug and simpler confirmation handling