added missing changes for surfaces