merged with new PAT tools