syncing with latest version of spec