Add Chainsaw and other changes