Update: now considering trades