code review toward 0.9.5.3