Improved dealer. Implementation changes.