Updated version to avoid caching