Harvest & Main & Tools update (Merge)