Improved farmer model