Major edit of RFP