more changes for web api
second pass