Updated version to prevent cache