added UpdateFarm functionality
Merged files