Fixed trade tracker for v600+