add pitch support and use new Width