Further work to Farmer package in win.