updated to match #5 and #6 calls from API spec