Some changes to advanced trading