updates for mashery take 2