added missing return types