Modified RFS and added a new wrapper file to help with pre-processing.