update tooling to handle r15/16