Revert "Revert Effects changes"

This reverts commit 12c7c4e70bedee327db53d54f4eba1858f6ecd6d.