Changed return types.