updated to the new spec format