Trader Updates
Revert "Trader Updates"

This reverts commit ac17b5f11e8bc3d64c768770b4feb8e6c4687d8a.
Revert "Revert "Trader Updates""

This reverts commit b2044d12ff92fb2128df96c7087abdc499bb4252.
Trader Update