make reactivity / load order more resillient?