fix mechanism and add answer correctness