Updated for independent events