Reactivity clean up attempt #1