Changes for correctness