Forestry work and Fix #8