work: tuned api to incorporate into main logic