updated to include full api