Merge pull request #138 from 5150Joker/dev

Speed farming fix redone for new centralized code.