updated based on the 1st example you provided.  I pulled this from the API docs, so we may need an update there as well.