changes to sync with GAE copy