--modifying farmerbook code for latest changes