BC-1441, BC-1442 comment fixed + improve the codes