Revert "Revert "Added support for interleaving effects with updates""

This reverts commit 7e6d9e792de0366107fcbbaa16b71d60cb5a8ef3.