added partial support on inital rpt manual data