More EQ improvements...