changed eqs a bit