Completed Complementary QE changes + NextStar #93