updates for apiversion 2