Modifications for better integration between QE and QP