last few commits fix