move this to onbuild as well