isuue fixed , and commented