Merged with the updated EQ and and Optimized the system