Fixed the farm (including notifications)