updated again with name changes and added missing fields