Changes to new ori tools caps