resolved issues of 31 jan