Edits to tooling