Small changes, still working on trades