Use rlog and fix api