added ability to substitute values into partial calls