made return types consistent