Added eq and popup