Added TODO:  Update for use with new API