some changes + f-value calculation