Pkcsicsf 3

This is same as pkcsicsf_2 branch but with review corrections made.