use new internal tool