added some rsfp checking